Revision: tla-buildpackage--head--1.0--patch-17
Archive: jgoerzen@complete.org--projects
Creator: John Goerzen <jgoerzen@complete.org>
Date: Wed Oct 15 14:56:55 CDT 2003
Standard-date: 2003-10-15 19:56:55 GMT
Modified-files: ChangeLog tbppy/tbpimport.py
New-patches: jgoerzen@complete.org--projects/tla-buildpackage--head--1.0--patch-17
Summary: Alter importation of Debian diffs to merge new upstream
Keywords: 

While the algorithm in the code now does work (check out upstream, change
tree to Debian, then apply Debian changes), the Debian files all get deleted
and the re-added on each merge.  This is because the explicit tags have to
be re-generated, so tla doesn't recognize it as the same file.

So, a new algorithm will be to:

1. check out Debian tree

2. if it does not already include the right upstream:
   a. star-merge the upstream
   b. delete any orig/rej files left around and otherwise ignore conflicts

3. tla_load_dir the Debian tree over it, effectively masking conflict
   problems

This is a first attempt at that implementation.